From f2d2bfea845942ae8b1b875915b5358b0c36e3f9 Mon Sep 17 00:00:00 2001
From: Brian Koropoff <bkoropoff@gmail.com>
Date: Thu, 28 Aug 2014 23:35:47 -0700
Subject: [PATCH] Fix deprecated method/function warnings with rustc master

---
 src/cargo/core/manifest.rs      | 3 +--
 src/cargo/ops/cargo_compile.rs  | 5 ++---
 src/cargo/sources/git/source.rs | 2 +-
 src/cargo/util/toml.rs          | 4 ++--
 4 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/cargo/core/manifest.rs b/src/cargo/core/manifest.rs
index 174e751aa..dc6d27f63 100644
--- a/src/cargo/core/manifest.rs
+++ b/src/cargo/core/manifest.rs
@@ -1,5 +1,4 @@
 use std::hash;
-use std::result;
 use std::fmt::{mod, Show, Formatter};
 use semver::Version;
 use serialize::{Encoder,Encodable};
@@ -85,7 +84,7 @@ impl LibKind {
     }
 
     pub fn from_strs<S: Str>(strings: Vec<S>) -> CargoResult<Vec<LibKind>> {
-        result::collect(strings.iter().map(|s| LibKind::from_str(s.as_slice())))
+        strings.iter().map(|s| LibKind::from_str(s.as_slice())).collect()
     }
 
     pub fn crate_type(&self) -> &'static str {
diff --git a/src/cargo/ops/cargo_compile.rs b/src/cargo/ops/cargo_compile.rs
index 1c35a0f2e..8b686af2d 100644
--- a/src/cargo/ops/cargo_compile.rs
+++ b/src/cargo/ops/cargo_compile.rs
@@ -24,7 +24,6 @@
 
 use std::os;
 use std::collections::{HashMap, HashSet};
-use std::result;
 
 use core::registry::PackageRegistry;
 use core::{MultiShell, Source, SourceId, PackageSet, Target, PackageId};
@@ -147,9 +146,9 @@ fn source_ids_from_config(configs: &HashMap<String, config::ConfigValue>,
 
     // Make sure we don't override the local package, even if it's in the list
     // of override paths
-    result::collect(paths.iter().filter(|p| {
+    paths.iter().filter(|p| {
         cur_path != os::make_absolute(&Path::new(p.as_slice()))
-    }).map(|p| SourceId::for_path(&Path::new(p.as_slice()))))
+    }).map(|p| SourceId::for_path(&Path::new(p.as_slice()))).collect()
 }
 
 fn scrape_target_config(config: &mut Config,
diff --git a/src/cargo/sources/git/source.rs b/src/cargo/sources/git/source.rs
index ff8ef9ad9..b0198dd95 100644
--- a/src/cargo/sources/git/source.rs
+++ b/src/cargo/sources/git/source.rs
@@ -195,7 +195,7 @@ impl<'a, 'b> Source for GitSource<'a, 'b> {
     }
 
     fn fingerprint(&self, _pkg: &Package) -> CargoResult<String> {
-        Ok(self.rev.get_ref().to_string())
+        Ok(self.rev.as_ref().unwrap().to_string())
     }
 }
 
diff --git a/src/cargo/util/toml.rs b/src/cargo/util/toml.rs
index e4ea5ba99..117b68d62 100644
--- a/src/cargo/util/toml.rs
+++ b/src/cargo/util/toml.rs
@@ -396,10 +396,10 @@ impl TomlManifest {
             None => inferred_test_targets(layout),
         };
 
-        let benches = if self.bench.is_none() || self.bench.get_ref().is_empty() {
+        let benches = if self.bench.is_none() || self.bench.as_ref().unwrap().is_empty() {
             inferred_bench_targets(layout)
         } else {
-            self.bench.get_ref().iter().map(|t| t.clone()).collect()
+            self.bench.as_ref().unwrap().iter().map(|t| t.clone()).collect()
         };
 
         // Get targets
-- 
2.30.2